From c7e81acf3529e9ae69cd7ded657a0085c276f81e Mon Sep 17 00:00:00 2001 From: "djm@sportsman.spdomain" Date: Wed, 13 Apr 2005 16:17:29 +0000 Subject: [PATCH] bitkeeper revision 1.1277.1.4 (425d4619QQPyUhs4FSWUJMPPTkuiVg) mkbuildtree, Rules.mk, Makefile: minor makefile cleanups --- xen/arch/ia64/Makefile | 10 +--------- xen/arch/ia64/Rules.mk | 21 ++++----------------- xen/arch/ia64/tools/mkbuildtree | 1 - 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile index a6becc9ac5..b8f1fdf161 100644 --- a/xen/arch/ia64/Makefile +++ b/xen/arch/ia64/Makefile @@ -18,19 +18,11 @@ OBJS := $(subst $(TARGET_ARCH)/asm-offsets.o,,$(OBJS)) # remove following line if not privifying in memory # OBJS += privify.o -# What happens here? We link monitor object files together, starting -# at MONITOR_BASE (a very high address). But bootloader cannot put -# things there, so we initially load at LOAD_BASE. A hacky little -# tool called `elf-reloc' is used to modify segment offsets from -# MONITOR_BASE-relative to LOAD_BASE-relative. -# (NB. Linux gets round this by turning its image into raw binary, then -# wrapping that with a low-memory bootstrapper.) default: $(OBJS) head.o ia64lib.o xen.lds.s $(LD) -r -o arch.o $(OBJS) ia64lib.o $(LD) $(LDFLAGS) -T $(BASEDIR)/arch/$(TARGET_ARCH)/xen.lds.s -N \ -Map map.out head.o $(ALL_OBJS) -o $(TARGET)-syms $(OBJCOPY) -R .note -R .comment -S $(TARGET)-syms $(TARGET) -# $(BASEDIR)/tools/elf-reloc $(MONITOR_BASE) $(LOAD_BASE) $(TARGET) asm-offsets.s: asm-offsets.c $(CC) $(CFLAGS) -S -o $@ $< @@ -45,7 +37,7 @@ ia64lib.o: clean: rm -f *.o *~ core xen.lds.s $(BASEDIR)/include/asm-ia64/.offsets.h.stamp - $(MAKE) -C lib clean + rm -f lib/*.o # setup.o contains bits of compile.h so it must be blown away delete-unfresh-files: diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk index 3883eeee63..d4ac827b9a 100644 --- a/xen/arch/ia64/Rules.mk +++ b/xen/arch/ia64/Rules.mk @@ -1,33 +1,20 @@ ######################################## -# x86-specific definitions +# ia64-specific definitions -ifeq ($(COMPILE_ARCH),$(TARGET_ARCH)) -OBJCOPY = objcopy -endif ifneq ($(COMPILE_ARCH),$(TARGET_ARCH)) -CC = /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-gcc -LD = /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux-ld -OBJCOPY = /usr/local/sp_env/v2.2/i686/bin/ia64-unknown-linux-objcopy +CROSS_COMPILE ?= /usr/local/sp_env/v2.2.5/i686/bin/ia64-unknown-linux- endif -HOSTCC := gcc -#LD := ld -# Linker should relocate monitor to this address -MONITOR_BASE := 0xFC500000 -# Bootloader should load monitor to this real address -LOAD_BASE := 0x00100000 AFLAGS += -D__ASSEMBLY__ CPPFLAGS += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64 CFLAGS := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing #CFLAGS += -O3 # -O3 over-inlines making debugging tough! CFLAGS += -O2 # but no optimization causes compile errors! -CFLAGS += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE) +#CFLAGS += -iwithprefix include -Wall -DMONITOR_BASE=$(MONITOR_BASE) +CFLAGS += -iwithprefix include -Wall CFLAGS += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__ CFLAGS += -I$(BASEDIR)/include/asm-ia64 CFLAGS += -Wno-pointer-arith -Wredundant-decls CFLAGS += -DIA64 -DXEN -DLINUX_2_6 CFLAGS += -ffixed-r13 -mfixed-range=f12-f15,f32-f127 CFLAGS += -w -g -#TARGET_CPU := i686 -#CFLAGS += -march=$(TARGET_CPU) -#LDARCHFLAGS := --oformat elf32-i386 LDFLAGS := -g diff --git a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree index d343b9636f..55dd82066d 100644 --- a/xen/arch/ia64/tools/mkbuildtree +++ b/xen/arch/ia64/tools/mkbuildtree @@ -34,7 +34,6 @@ null () # ensure linux directory is set up if [ ! -d $LINUX ]; then echo "ERROR: $LINUX directory doesn't exist" - echo "(don't forget to apply the -ia64 patch to it too)" exit fi -- 2.30.2